From 92c49114e52320101d4bc269d98ca44a2dea5559 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 25 Aug 2024 13:06:48 +0200 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 551753 -> 551893 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 78cc402f0c2..213c8fd0b1b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -98,6 +98,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index b3beef397911b6eff88359ecd88b399ff36a131a..9d2d52da3a45047ac69f1217f26100cc53d9c64a 100644 GIT binary patch delta 178 zcmX?kP4Vh=#fBEf7N!>F7M2#)Eo?KE)MutCl%y7yDCkxw=$953=_h68>8BKAr|Tw_ zX6B@%ucK!As1kc+EdymLT+n~$S=ux$dGY6V^0^wbgsn7o3KoqkGc wnSNerPEG<>S|*pHb9`{9Q*ej|*dShnNt#?-(-W7oNw#lX!nS?m680I#07N!BSpWb4 delta 31 ncmcb5UGd~K#fBEf7N!>F7M2#)Eo?KEw5u#-+pe;ded93z)z=LB diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index f14e9f1a1ed..c1b95a69bea 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -272,6 +272,8 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2